Merge branch 'upstream/latest' into debian/master
authorSimon McVittie <smcv@debian.org>
Sun, 26 Jun 2016 11:15:11 +0000 (12:15 +0100)
committerSimon McVittie <smcv@debian.org>
Sun, 26 Jun 2016 11:15:11 +0000 (12:15 +0100)

Trivial merge